Make it work with *big* icon views. (#154466)

2004-11-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make
	it work with *big* icon views.  (#154466)

diff --git a/ChangeLog b/ChangeLog
index e18d898f0369eba8cf2a64c0a019308b22d90b87..0ebca7147308d02b6af6a48f68eff5a089be6c04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make
+       it work with *big* icon views.  (#154466)
+
        * tests/testiconview.c: Add a real "Add many" button.
 
        * gtk/gtkaction.[hc]: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e18d898f0369eba8cf2a64c0a019308b22d90b87..0ebca7147308d02b6af6a48f68eff5a089be6c04 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make
+       it work with *big* icon views.  (#154466)
+
        * tests/testiconview.c: Add a real "Add many" button.
 
        * gtk/gtkaction.[hc]: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e18d898f0369eba8cf2a64c0a019308b22d90b87..0ebca7147308d02b6af6a48f68eff5a089be6c04 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make
+       it work with *big* icon views.  (#154466)
+
        * tests/testiconview.c: Add a real "Add many" button.
 
        * gtk/gtkaction.[hc]: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e18d898f0369eba8cf2a64c0a019308b22d90b87..0ebca7147308d02b6af6a48f68eff5a089be6c04 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make
+       it work with *big* icon views.  (#154466)
+
        * tests/testiconview.c: Add a real "Add many" button.
 
        * gtk/gtkaction.[hc]: 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 7421429457c7b6667a64dc6ec115ba3d4d5d75fc..0d9ec1cb96adbc0352c47089404638a769e8fb37 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -736,7 +736,7 @@ gtk_icon_view_realize (GtkWidget *widget)
     gtk_widget_get_events (widget);
   
   icon_view->priv->bin_window = gdk_window_new (widget->window,
-                                         &attributes, attributes_mask);
+                                               &attributes, attributes_mask);
   gdk_window_set_user_data (icon_view->priv->bin_window, widget);
 
   widget->style = gtk_style_attach (widget->style, widget->window);
@@ -2772,7 +2772,8 @@ gtk_icon_view_scroll_to_item (GtkIconView     *icon_view,
   gint y, height;
   gdouble value;
 
-  gdk_window_get_geometry (icon_view->priv->bin_window, NULL, &y, NULL, &height, NULL);
+  gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window), NULL, &height);
+  gdk_window_get_position (icon_view->priv->bin_window, NULL, &y);
 
   if (y + item->y < 0)
     {
@@ -3282,7 +3283,7 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view,
  * gtk_icon_view_get_selected_items:
  * @icon_view: A #GtkIconView.
  *
- * Creates a list of path of all selected items. Additionally, if you are
+ * Creates a list of paths of all selected items. Additionally, if you are
  * planning on modifying the model after calling this function, you may
  * want to convert the returned list into a list of #GtkTreeRowReference<!-- -->s.
  * To do this, you can use gtk_tree_row_reference_new().